<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <title>Title</title>
</head>
<body>
<<<<<<< Updated upstream
<h1>dd提交
ddd
ddddddd</h1>
=======
<h1>dd本地修改后代码冲突ndddddddddd</h1>
>>>>>>> Stashed changes
</body>
</html>